Merge from emacs-24; up to r108145
authorChong Yidong <cyd@gnu.org>
Fri, 21 Sep 2012 03:04:28 +0000 (11:04 +0800)
committerChong Yidong <cyd@gnu.org>
Fri, 21 Sep 2012 03:04:28 +0000 (11:04 +0800)
commitd2ed0bdb79f78e58c1c8fe36aae440ec48a1a7d0
treedf55f007ce5a671ce067472d5d4835f694ee6d71
parent12791dee399b3d4a742e9555efc4ec74ef1edfd8
parent8c0ada445bf3e29327645e48e3d03292bd2d4651
Merge from emacs-24; up to r108145